Refactored all of the tests. It's not great, but it'll do for now.