Added better sandbox testing, tested EEv3.1.36.6