Deleted testdb button and made some corrections in the code
Merge remote-tracking branch 'origin/master'