Revert unintended changes to this file
Fix tests