Tests updated for non-ss sample