Added tests for db_manager, optimized imports
(John K, Sam N)
Merge remote-tracking branch 'origin/master'