Minor unit test improvments