added tests, updated name