Some minor improvements in the unit tests