Added generic conf define
Simplify
Updated tests