added a couple of new tests and a new feature