request fix + tests