Changed the api of the test suite
Remove dead requires