tests improvements
0.7.4.8