Some cleanup of unused Helper methods, plus add testmodel methods for map/set/list params and tests