Tests now build on the device Fix file paths in tests so they pass on the device Removed some old cruft
