Addressing failing tests