Fix test cases not compiling and throwing errors. Some are failing, though