Removed a broken test.  Fixed an improper handling of null parameters.