Added nonwork and test data set factors