Add a test-suite stanza for specs

Also reorganise specs
Merge branch 'test-suite'