Comparator factory ensures Comparator classes implement interface, added tests.
Fixes to Dependancy Injection
Label factory ensures Label classes implement interface, added tests.
Typo fixes