Starting tests, a few fixes for Glossary