Add some stuff to make testing easier