Feature/modularize test output