CRAZY EXPERIMENT Part2: add it to the tests too