Add test

Move also some package to have the condition for asserj on
the same place