Fixed some tests and incorrect variable names