Solved failing tests