Merge "Added parameter to kitchen test function"