Make basic test cases pass