Issue #114: Fixing tests and feedback from @amitaibu