Project tweak
Life fixed and new tests written