Updated test cases

Now they all work.