Few extra tests