Updating tests
Improving test code