adding oship, fixing owner tests