Adding more options to the model independent method in testing