Fix broken unit test
Fix up broken tests