fixed parent bug
minor fix
new tests added