tidied up test/owner