Completed Top refactoring. Tests now runs without legacy true.