Clean up and add NumberFormatException test