Adding more unit tests, making sure all our classes have default options.