Updated #260 to adjust tests

Updated #260 to adjust tests: Rationale is explained in the commit message.