Fixes plus another test conversion