Adding more tests and restructuring connection string into a separate module