Some more regression test work