Updated test cases, per izzy's feedback