Minor adjustments
Transform comments into tests in rescue block