Added tests for new functions