Changed activate and test parameters to options