Merge "Add parameters for running tests"