Deleted file for DB test, update Data Storage class