Unit test updates

Made a bunch of updates to unit tests.