Addition to #86, tests added in PR.
Addition to #86, tests added in PR.