Minor fixes to get tests to pass.