Good work on configuring tests to work with recent changes.