#22 Automated tests: implemented comments of #38