Simplified configuration and fixed corresponding tests