NAR-306 #comment fixing tests, still,