Fix ObjTests. Fix TypeValueSetsHelper package. Add unit tests back to build