Fixing import issue - tenant IDs can be strings

Fixes #455 
Sure - will do this and tests sometime tomorrow