Solution model and its test added