updates to fix tests.