Added more variables to test