Rearranged some tests among files