Improved test files and added Ant test target