issue number #157 - resolved failing unit tests