Added more testing capabilities