Code refactoring

- Deprecated unused values
- Added new test case
- Corrected bug found with the new test