Added frame_type to the callback. Restored deleted test case.  Resolved review comments.