SOO and generate and test added