Improving test classes