Reverted test changes
merge