Some cleaning up of conftest.py
Merging remote and adding db teardown to db pytest fixture in conftest.py