Fixed the things that were broken with the last commit (build all test cases next time)