remove ; from names
Merge branch 'tests'