updated test data and utils