Minor tweaks to test db

Now allows tabs to populate correctly
Merge remote-tracking branch 'origin/master'

Commit to resolve conflicts