All tests do pass fix\remix