I improved tests organization so that we can easily differentiate between specs and integration tests.