Added more testing stuff