Date: Updating test suite to coding standards.