Cosmetic change to perfect foresight + unit tests