ispec tested
comments refactored into partials