Fixed some messed up test cases and the breaking of the build from previous commit