changing .should to expect().to
removing redundant tests