changing tests according to clarifications from Dimitri Glazkov