Added new handler + tests, renamed sockets file.