Add test cases for new functionality