Finalize tests for staging