files clean up
added a configuration for the test environment
code clean up