added tests. ID-235