Add tests to cover new functionality