Corrections to include lookup and tests