Add tests for new feature