Minor name changed, better class support + code coverage + tests