Fixes for Dean's unit tests.