Fix unit tests so that some naming rule set applies.