Add randomness to test generation
Begin handling of multiple parameters