Add UseCase spec files
Merge fix