fixed all the testing crap