Updating: generally improving the testing setup