move 'assert_response_contains' helper to a better place
inline some test helpers, extract others