DAO: Changed the datasource properties and prepared for testing