Bugfixes in xy test case