Modified test script
Modified databse script