More tests, clean up of parent setting code.