Test use the singleton for the Factory (to also cover the singleton part in the tests)
Merge branch 'master' of github.com:Seraf/LISA