Split the child watch test functions

Make these functions two tests instead of the
same test (this helps in debugging test failures).