more testing
removed nhibernate stuff again