Fixed Megan's stuuuuuuuupid test names, and did other test stuff.
Merge branch 'termp'