LPS-35004 & LPS-35005 Wiki staging refactoring & tests

Hey Brian,

This is the Wiki re-factoring for the new staging and the related tests. Two tickets but Zsolt sent me in the same PR I left it like there because they are heavily related.

Thanks,

Máté