Updating: minorly improving the testing setup