Add test coverage for 630e16202bd9c82664bb9b1368da0ced165aac86