More and better tests around clever integration