Laurens branch

Pull request: moving test files + build.xml onto master branch