Tests continued, fixes too.