Fixed issues between test/sample HTML and services