changed int to long when field is id
added tests