Added test for frame type
Fixed cut'n paste defects