NotationBuilder/Tester rework. Haven't finished yet.