Added test cases for new functions