Added further testing around NHibernate. Improved a few other tests