FYI: My last couple of changes include some optimizations to unittests (and fixes to properly tag some integration tests as such), which leads to all unittests running in under two and a half minutes on my macbook air.