more tests, and some utility methods.