remove test file
Merge branch 'harris' into dev