Merge "Change space base test to use parameters"