Make object tests pass