Bring back the full test suite
Make the tests green