Reverted all test changes