improve .should behaviour