added tests, fixed underscore in variable naming