Update fixtures, clean code institution inporter #2