Sorted out build so that no test artifacts sneak in to JAR files and unit tests run properly from ant