Adding additional tests