improved reqex and testcases