Revert "Fixed test ctors in DBTest"

This reverts commit 5ea382f069bcb95b81acc043b291318f4eb94569.
Revert "pulls navbar to separate file"

This reverts commit f849489306dd32a644d267ab8b6805b45c76766b.