Database testing and JUnit for Database created
Merge origin/master