fixed 9 failing tests