Added OverlapP reconfiguration and new tests; Fixed problem with drain channels