Fixed up some test cases, not complete