Extend code test coverage