More methods and tests implemented.