Added a few more tests and made notes for even more.