Added P07. Small changes in tests.