Improve tests

* Failing tests now succeed
* Tests are now 50% faster