added some test improvements
Test improvement about #136