WP-2012: test issue remove unneeded folder.
WP-2012: test clean up config file.