Added some more tests. Added all includes to index.