Add a couple of tests and use a better message for tests.
Update tags file.
Simplify code.