More and better tests