Updated unit tests for labeleddata.
Resolving merge conflicts in tests_labeleddata