added tests, fixed functions identifiers