Fixed broken tests due to missing approved file and name parameter being passed as nil.  Removed superflous comments.