Add some more note tests and fix up functionality accordingly.