Fix loading error.
Added with-ad macro.

* Simplify code.
Clean code.

* Remove iterative code development.
Clean code.
Homogeneous tests.