more and better tests