fixes on unit tests