rearranged some tests