Failing test + fix for NH-3555

Failing test + fix for NH-3555
https://nhibernate.jira.com/browse/NH-3555