Added null handling tests