Added some specs to remove some silly nullpointers.