Refactoring + websocket test + update to play 2.2.1