Add tests for new functionality