Refactor tests in preparation of the merge of redirect tests.
Refactor tests in preparation of the merge of redirect tests.

okin/nikola,getnikola/nikola,okin/nikola,getnikola/nikola,okin/nikola,okin/nikola,getnikola/nikola,getnikola/nikola