OA-125, re-added in parameter count test.  Removed unused param from mocked test as it was never being used.  Removed tests that aren't being used because the test was written originally to find an exception thrown early on.  The verification at the end of the test is superfluous due to this but is left to keep original intention intact.