Improve kata form and tests