removed unused uses
add handler tests