Improved Testcases, finished build.xml, model revamp