Adding few additional tests