Updated function name, added tests