Added more stuff to the test