Added  tests