Fixes and speedy status checks

Local lime now: Ran 81 tests in 571.345s
Was: Ran 81 tests in ~722.462s