Fixing testing on project and in sample generated project, general cleanup