Improve eff. leakage area constructors, write test