bugfix on unit tests