Updated a little of the tests; don't know yet about the config tests part (last three tests)