Updated test data and added functions