Using Merge instead of SaveOrUpdate in NHibernate repository; Moving WithMappings method to the abstract storage; New specs