Remove bogus commit
Fix up tests