Fix all test to the new structure making more moves to maintain unity