Migrated test suite to SHOULD-TEST
fix
merge