Fix duplicate commit
Re-introduces the changes from merge request !139 (merged) which were revert in !141 (merged). Duplicate commit about cmake test configuration is removed. Closes ACTS-123
Re-introduces the changes from merge request !139 (merged) which were revert in !141 (merged). Duplicate commit about cmake test configuration is removed. Closes ACTS-123