Some fix test + revert formatting code