Remove use of wrapped functions.
Use 'are' macro for multiple assertions