Move responses into own file, fix random connection spec error