Added some tests
added missing files