Added test set mode