Issue #266 completed. BTM  Test now have db check