New testcases

Fix conflicts