BUG: Still failing one of the tests