Fixed the two failing tests