Work on Conditions, new tests.