Added two new test classes as described in the submission doc.