Moved stubs to mock package
Use stub data sour e
More work on class transformer