Fixing the unit tests after adding a new parameter.
Adding in a bunch of unit tests to help exercise functionality.