Refactor demo page tests
Add ids to grade and test headings for ease of testing
Complete tests for cluster results page