Extended threshold date, and cleaned up tests