Add some methods and tests