Remove whitespace
Sort files in test