Enhance tests
Fix merge conflicts
Fix spelling error in file name
Add feature files for remaining use cases