Get test cases working