Refactored tests to match json/html/application