Refactor
Web interface mocks