Added extra null tests & made test info generic