Added more tests. Cast IDs to long