Added dependencies for Arquillian tests
Added TestBasicEntityCollection, arquillian.xml and test-persistence.xml
Fixed everything
Merge branch 'testing' into dev