and now with all the test classes