Fix tests to reflect some dtype string changes