Memory and test fixes

A couple test fixes to quieten down tests, and journal during tests.