Updated test cases to be simpler.