some clean-ups + extended test frames