testing: suppress diff warning + minor refactor