Small refactoring; needed for unit tests.
Small refactoring; needed for unit tests.

mdimjasevic/debile,lucaskanashiro/debile,opencollab/debile,tcc-unb-fga/debile,lucaskanashiro/debile,opencollab/debile,tcc-unb-fga/debile,mdimjasevic/debile