Added some methods + tests.