Bug 1111077 - Enforce FrontendHttpServer state to match .state file

* Update tests