Updated classifiers.
Implement singular vs. multiple failure test.
Removal of diagnostic information.
Added Mapping container tests.