Improving test case source
Improve test naming