moddified req, corrected test cases after req.