Fix tests

This should now pass all tests without needing to roll back to another revision.