Added tags on notes and improved (read: broke) tests.