Test for null on close
Remove separate test files for same thing...