Add more tests and a couple of new methods