More tests, benchmarks. Add plural form for ms.