AC-FOVE: code cleaning

* Cleaned code for water network tests.