Make all area unit tests pass