Fix until/since tests