improved test coverage and removed parent field