Changes around tests