cleanup
http response chages
fixes for tests