Fix tests
Remove rebase mistake