Added some methods and tests