Minor changes to unit testing.