Fix failing tests related to Splat 1.2 upgrade