fixed two failing tests