New testcase, this should be simplified