Fixes for contract list bugs and test backfill