Fixes to make the test work.