Added tests for remaining methods