fixing tests

now fixups does the right thing, but test count still off