tests pass, sanity restored