Refactored tests setup. TODO: refactor actual tests next.
Decorated proxy model.