Adding tests and fixing issue with child
Small cleanup