add some missing var's to prevent globals and make last test not async