Add more testing stuff