refac tests so that tagbase can go out one day