Got several of the bullet tests working again.