Add tests to cover new feature