fixed tests
updated doctrine
fixed tests
merged with develop