tests updated, removed find-atom