More and better unit testing