Better parameter handling for tests