Making Tests Pass

Made it so the tests pass locally, and tidying up the build so it moves the xml correctly on build