FileWriter functionality corrections. Test updates to handle pretty
formatting