Improve API on children test
Add cupcakes test