TST: Made changes as suggested by Josef in issue 622