Tests are now passing after rebase