Added ability to test without normal database