Fix test suite
Cleanup