Clean up unused import
Rename ElementProxyTest to ElementHandlerTest
Make ElementHandlerTest more unit-y