Small test changes to make them automatizable