Some changes to unit test setup and dependencies.