Refactored tests to use expect instead of should