More code cleaning and implementation of missing elements.
updated some basic tests
nothing special :)
implemented support for conditions (JEXL) and tests