Fix ant test units
Cleaned up files