Improved bootstrap test