restructure tests a little; timing