Added initial tests for null checking