Config: clean code.
Test: Remove echo statement.