Added fix for keyframes, added keyframe test