remove test file
remove evan test file
Merge branch 'harris' into dev