Added a testcase and messed with the cases a bit.