changed .should syntax to expect( ... ).to syntax in all specs