Unit Tests for Object Classification Message handling

and some minor changes