Added tests for id types and fixed broken lookups