Address: Increase test coverage