add retrofit tests and cleanup
add retrofit tests and cleanup