Changed tests to use ahven and JUnit format.