Use assert_includes(thingy, other) rather than assert(thingy.includes?(other)).
Slightly reorganize tests to be laid out in a more friendly manner.
Refactor SQL to solve TODO list.