StrignGrid test fix
final test fixups