updated tests according to comments in pull