Minor changes to unit tests