Added some new methods and tests.