Some minor tweaks to test cases which are failing on work machine, but not home machine.
Also, correct build.xml