Tiny cleanup
Reenable tests. Everything breaks. Tears.