test is rewritten to avoid inconsistence. 
3 files changed