Small update to plot function, and added test model - NHPP GO for
Firefox v5
catchup commit