Add Viewporter definitions and tests