Changed structure of specs
Implemented composable specs