fixed parent stuff, moar unit tests