Merge "Fixing the startup after junit increase"