Add quick trivia test
Merge