refactoring composite specification tests
Further simplified composite specification tests