FIx up object tests