Fixing unit tests, integ tests.