re organized tests