Updated sql and test data