Implemented missing methods and added tests for them