[#1865] Kisitu/Faris | Refactored and fixed the database not closed error.
[#1865] Kisitu/Faris | Changed test url.