Re-adding commented-out tests now that the encoding issue appears to be fixed