Fixing the tests (I think)

* Tuned the tests
* Fixed the build (I think)
* Made it much faster