Fix bug in addtests macros.

Variables are global in Cmake, and ARGR was used int two different macros, resulting in tests being executed will all factories activated..
In the end only Thread factory seems to have been tested in the last few months ...