Removed auto config feature
Updated test