Format and more addition tests