Slight enhancements to func test
Convert to class based test