Migrating to test objects