Enhanced webserver to show also our tests
Merged with master