Remove old unnecessary configuration property from the test
Cleanup and removing empty todo