Add tests; add property file for testing non-destructive on production
rename tests
Merge branch 'RefactorTests'