Tidied up specs and introduced response