Tests.Main is improved