Fixes tests
Tests are now green