Take updates from temporary cmake testing repo