fixed last 4 failing tests