Remove old code
Fix up tests
Fix up tests