Removed logs
Made null test work independently or with other tests.  Added better error handling.