Fixed null reference error.
Two more tests.