958827: added tests