added tests
changed name