Update tests according to comments from Kirill