Remove prototype code
Add handler test