NH-465 Fix, also contains test fixtures that somehow got left out from pull request #107

Contains fix for NH-465.

Also when I merged nhibernate-core/master back into my own I found that the test fixtures for NH-3148 were somehow not pulled into nhibernate-core from pull request https://github.com/nhibernate/nhibernate-core/pull/107.