Updated classes, and tests.