Add ownership tests and specs