Added and passed some more tests