failing tests fix