fixed some of the testing