Everything works again, finally
Tests