Updated test data + tag parsing