Added some tests. They're failing, and I dunno why