SWC-1469 moved key, fixed and added tests