rearranged files in unit tests