Actually fixing SetUp and the test cases