finished database tests for current functionality
Merge remote-tracking branch 'origin/master'