Added cmake test runner bits