Rollback #1620
Add unit for finding parent resource