Some additional tests implemented