Web-Cat testing

Fixing all the problem that web-cat detects