Added more specific test for each parameter and better test code organization.