Added and fixed tests
Fixed Configuration