adding code that was stripped out on merge.  Removing unused test