Migrated more unit-tests