Add arithmetics, revise tests