Fix tests as per Issue #26