Assert macros are getting a bit more information about the error and
some minor formatting
Refactoring