fixed some arrangement in test files