fixed tests
fixed variable names