Update tests, use scenario outline