+1, but this can be done after the merge. A checkup of all tests for consistency in style would be a good idea -- the HMM tests in particular are very different from the rest.