Fixing bug with label resolution in class hierarchies without annotations.
Also deleting unused class from test sources.