Improving test class but still not what I was hoping for