tweak testing and logging