Add handle tests