add formating of statements and statement tests