More changes from the testing chapter