ME: fixing failing tests