added tests and test requirements, changed variable names