Reformat code
Follow junit naming convention