stock reco fixes with testcases