updated grammar and updated tests folder