Further update to unit tests.