Minor change + added response tests