fixed  Unit tests fail #15