[Tests] revert temporary changes