Added more testing