Added a couple more tests. Things are screwed up right now though.