Object class fixes and tests