[Matahari] [PATCH] tests: tweaked some error messaging