Update tests thanks to @janmeier's review