Changes to unit tests