get the tests to comply to the new API
fix circular dependency
improve the class finder