Made the tests pass. They still aren't great tests, but they do pass now...