Did some logging mods and made several changes to HA Test