incorporate tests listed in issue #45