Increased test coverage
Suppressed noisy output from http server
Merge pull request #17 from androm3da/master

Increased test coverage