moar tests passing
More tests passing and tests no longer time out.