Reverted test changes