Fix tests missing should
Remove some globals