Ugly hack to migrate the rest of the tests
Split freeze test out of api tests