Refactored tests to use newest version of should