Working on adapting the test cases