Updated and modularized test suite.