Renaming, added test case for with clause