request, response modifications + tests
refactored response creation