rearranged unit tests