Remove unused branch and obsolete test
Fix tests