migrated some legacy tests