A couple tests fixed so that they pass