Failing tests fix