Added tests for missing methods and removed unused ones