Changed name
added tests