Merge "Change space base test to use parameters"
am: 72d4fe6de2

* commit '72d4fe6de2d25a655ccd3167e509f0bfa2261678':
  Change space base test to use parameters