Expands tests for CTE, cleans up organization