fixed  #15 - Unit tests fail