Fixed null objects and test data