tests: added some missing closing tags
tests: unified use of some keywords