Revert Victor and StageTest to previous commit 41e02a7