Fixed the test so that they run with gradle test too