changes on spring context and include production/test running mode