Minor renaming and new method stubs.
New Test: Tests Legend
Changes to Legend test and some more comments.