Adding error message output
Fixed up test assertions