Clean up test cases. Removing unimplemented test cases and making sure most of the test passes