Fixed minor bugs in the label of certain proto elements displayed in the Outline View. Code cleanup. Added more tests.