fixed 2 failing tests