Update test descriptions and fix bug in string handling

Change-Id: I728a3e50a559c6c23506130beb2ac32d4e1094c1