Revert catkin_make and use catkin_test_results to collect results from the testsuite