Updted tests