Adjusted one test.
Improved Configuration.
Adjusted one test.