Improved tests
Added doctrine files