Add test and reformat files