Renamed ENABLE_LOGGING + Fixed Test Cases

> Fixed Test Cases due to a change in syntax