Fix test failures, comment in timeshift feature as not working yet