split out tests more