Implemented new methods and tests