Tests
2.063 fixups
Remove debug writes