CPP11 cmake tests added
Merge cleanup