fix to unit tests