A very simple quick working test

…and some other little changes here and there (to let grunt test)