Updates to the testing