moved around test stuff to make more sense