Fixed ant test target and cleaned up tests