BZ-1018535: reverting another wrong change
fixing a test and ignoring other (just for now)