Hack the coercion magic numbers a bit, update tests for Record change