Add children relation and tests