SWTEST2 update