Added more stuff to the testing method