Added stuff to test