Upating: minorly improving the testing setup