Apparently we had zero test coverage of this, let's fix that. Change-Id: I00c906daf5acfc01913562036ca88abbf63dd3d9