Fiddle with trial and test spaces (initialisation).
More test-space magic.
Make use of extra functions in trial and test spaces.