adding ownership
cleaning up tests