move disposed field

reduce risk of race conditions
A few improvements done to acceptance test.