you changing the return object here @omaciel  - but I can not see the test_* classes updated accordingly.