fixed breaking tests and changed variable naming convention