Minor edit to restore unused params.
Implemented the four remaining test classes.