temp
corrected some mistakes, tests updated
Revert "temp"

This reverts commit d7dee58521b116caae04d8fff1bd696a64590faa.
Merge branch 'object_classes'