Cleaning testing code arround exception : back to the standard