One dumb bug fixed and additional test cases showing bad formatting