check owner WIP  + added some tests