test fixed
cs fixes
fixes on Purchase process