Added new modifications on framework and tests

Modified files default.conf and tests