Updates after annotation class/row changes (singular/plural).
uart: Updates due to the now-fixed bug #1474.
uart: Add more UART test-cases.