Add some more tests to be completed later.