adds synonym-related tests
improves ampersand parsing