Updated test to support supp2 and supp5