Updating some unit tests due to problems with expectations