[Added] Some additional tests