corrected formatter and added tests