Update tests
Changes differents things thanks to Matthieu comments