added tests of a bunch more private methods