some tests improvements

Tested on 1.8.7 and 1.9.3.