move id tests into SimpleQueryTests