updated cmake & test problems