Created parameterized versions of test.

Change-Id: I18ea037e975d78820b7c55c8d0cd4d481b336ca9
Merge "Created parameterized versions of test."