added fixtures, modif settings, tests