Add tests for nesting / repeated calls