Extra stuff to unit test