Added more stuff on testing