TEST more tweaks