Cleanup cmake and unit tests for merging of scheduler functionality.