Added tests for remaining functions