added tests; terminate_after_count in response