A few changes to unit tests