Added some more tests, cleaned up some stuff, too.