removed generated files
Merge branch 'master' into new-tests