Feature/integration tests