Added unit test and updated build.xml