TK-120001 added patch to servlet
TK-116205 Updated the tests to reflect what usage should look like