Fix merge issue that broke tests

This broke in a0172092e8da1814a15b8a7cfcd4c70f9d7c450c