need to fix up tests