Test Aid Fix

Fixes the problem where if a test aid is set, it's time zone would override any time zone passed in code.

Instead will alter the test time relative to the time zone passed.