move stuff into SpecSupport module

Tidying, too.