Added tests for new functionality
Added tests for new functionality