current testing tweaks