Fix some testing failures