Fixed tests with new configuration