updated all tests according to previous comments