Fix self tests