Added full test coverage to remaining classes.