migrated second set of tests