tweaks/tests