Turned original test puzzle into a real testcase.