added some tests for quiz index page
fixed merge conflicts