Fixes and tests surrounding keyframes blocks