Add a better management of demo and test base