Adding support for single database testing
Corrected paths for external testing purposes