Improving testing and coverage.  Removed unnecessary Parameter classes.