test: Improved code coverage