Updated some testing stuff