Adjust configuration handling
Use transaction in test