Some WIP for tests configuration: time to merge