Added some more tests...
Skip tests that are not implemented yet