fixed case for variables
fixed some user tests