Add messages assertion error messages to improve feedback

Update tests