Renamed test --> old
Added a couple of comments