Redo DatabaseTest.java
Merge origin/master