Update Rework for tests