Fix up tests
Fix up tests