Fixing tests to work with ids now being strings