Fixing unit tests problem (#232)