Tests: Improve test coverage

This pull request improves code coverage by removing dead code and adding tests to features/utility classes that were not sufficiently tested.