Revise testing for existence