Writing the leftover tests cleaning inconsistencies

### 🚀 The feature

Writing the leftover tests that were intentionally left at the time of migration and cleaning any inconsistencies

### Motivation, pitch

This will result in better code consolidation, manageability and will make the codebase easier for the future contributors to contribute to