Push fixes on unit tests