Adding onto spa-test