right you are; i too eagerly copy/pasted over it w a convenience class. Fixed and added check for correct class type to unit tests.