Fix tests
Fix typo
revert bad merge