Update tests to work with commit db4fe89 in specinfra

This PR just fixes some tests that were failing due to a recent change in specinfra.