some cleanup and more cmake tests